Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate fast forward merge #7

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Activate fast forward merge #7

merged 1 commit into from
Jul 10, 2024

Conversation

black7375
Copy link
Contributor

Graphite's trial period has now expired.
Temporarily use fast foward.

@black7375 black7375 merged commit 61ce72a into main Jul 10, 2024
1 check failed
Copy link

graphite-app bot commented Jul 10, 2024

Your org has enabled the Graphite merge queue for merging into main

Add the label “merge-queue” to the PR and Graphite will automatically add it to the merge queue when it’s ready to merge.

You must have a Graphite account and log in to Graphite in order to use the merge queue. Sign up using this link.

@black7375 black7375 deleted the fast-forward branch July 10, 2024 07:52
Copy link

Triggered from #7 by @​black7375.

Checking if we can fast forward main (61ce72a) to fast-forward (cbb4129).

Target branch (main):

commit 61ce72a3822d9bf9e15f57e1b3e559a02b309802 (HEAD -> main, origin/main, origin/HEAD)
Author: alstjr7375 <[email protected]>
Date:   Wed Jul 10 16:46:00 2024 +0900

    Chore: Activate fast forward merge
    
    See https://github.com/marketplace/actions/fast-forward-merge

Pull request (fast-forward):

commit cbb4129f48753661ef22647a7fd9f8b0c3f04a98 (pull_request/fast-forward)
Author: alstjr7375 <[email protected]>
Date:   Wed Jul 10 16:46:00 2024 +0900

    Chore: Activate fast forward merge
    
    See https://github.com/marketplace/actions/fast-forward-merge

Can't fast forward main (61ce72a) to fast-forward (cbb4129). main (61ce72a) is not a direct ancestor of fast-forward (cbb4129). Branches appear to have diverged at ee226c7:

* 61ce72a3822d9bf9e15f57e1b3e559a02b309802 Chore: Activate fast forward merge
| * cbb4129f48753661ef22647a7fd9f8b0c3f04a98 Chore: Activate fast forward merge
|/  
* ee226c7c6e1ddb9a9f70fe99766087832255fe02 Fix: Stabilize nesting order

commit ee226c7c6e1ddb9a9f70fe99766087832255fe02
Author: alstjr7375 <[email protected]>
Date:   Wed Jul 10 16:19:13 2024 +0900

    Fix: Stabilize nesting order

Rebase locally, and then force push to fast-forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant